Merge changes from topic "async_keystore2"
am: adde739791

Change-Id: I0e09d9f8f1cf5412c4a3e31495d7a3fd6d2f4982