Various fixes for async keystore.
am: 2ecd6597f3

Change-Id: If9fbafe597d1dbd104e52596f21acd3a41910e55