Merge changes from topic "async_keystore2" am: adde739791 am: 07aa20f967
am: 33862fbf03

Change-Id: Ibc917cb715d986dcd66d7a29269530b0091c8273