Merge changes from topic "async_keystore" am: 81c7e390e7 am: 6348c685b3
am: 00901d363c

Change-Id: Ic5cf2776e65897195c5b95af5d2e288235c61f04