am 47814acc: am f8a96d16: Merge "Cleanup keystore password changing and unlocking" into mnc-dev

* commit '47814accebd39afa0e53dba8608959ce0dea617c':
  Cleanup keystore password changing and unlocking