am 79571243: Merge "Track keystore password method changes"

* commit '795712431a4beafe9c62845f79aa00b648d3b767':
  Track keystore password method changes