Various fixes for async keystore. am: 2ecd6597f3
am: 2116843b17

Change-Id: Ibe2d442ac198a084199b980fe3a0425778e0d341