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

Change-Id: I51b62a4a401ffa86e6a3fc9bd794866936afc99b