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

Change-Id: Ic130119f9887dcb0d8459770aed2253bcbf909c1