Merge changes from topic "async_keystore" am: 81c7e390e7
am: 6348c685b3

Change-Id: Id65a0c7f9590f1bfd40462b15c1b301c609f47c1