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

Change-Id: I211b98c26d0c18c798c1b1f85b733024d908c2db