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

Change-Id: Ie2326ec19b82bf3977e490617fb9935b07dd818a