Fix keystore return code am: 2f96c79a9c
am: e978dd5a7e

Change-Id: I8791b98567947dbfa173ebe6fd689c4cb9d878ef