Merge "Clean up providing key via old API" am: 180b1a7f89 am: fe823efdae am: 270e041a14

Change-Id: I94cb7467ccd56711a4442fb6f1b795b8bf6bc284