Merge changes from topic "async_keystore" am: e8c144fe17 am: 07b06e1bdb
am: d46d33cf25

Change-Id: Id9fcb7d5bac0a24de8ca64e79d50131a5930b8ed