Merge changes from topic "async_keystore"
am: e8c144fe17

Change-Id: Idbc4ee09ae0f4900a00db7b2e83cfbdb4940ea7f