Merge changes from topic "keystore-rc"
am: e8c1317b77

Change-Id: Ic494e0103e71c02089178f24f818f1a68c0bcbe5