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

Change-Id: I667ac78ff5977d91ca737e99510bb2222cbcb77f