Merge changes from topic "async_keystore"
am: 81c7e390e7

Change-Id: Ia3d66878e989e2699f3ebb7cf1751970e0ba15d2