am e748729b: am c6f8a998: Merge "LockScreen: don\'t update KeyStore password...
am e748729b: am c6f8a998: Merge "LockScreen: don\'t update KeyStore password on unlock" into jb-mr1-dev
* commit 'e748729b':
LockScreen: don't update KeyStore password on unlock