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

Change-Id: Icc84ee275ce240fc65eb872d44ffc856e8cc8dd0