am e777e0a3: Merge change 25388 into eclair

Merge commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234' into eclair-plus-aosp

* commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234':
  Fix #1827299: Google login screen to re-enter password is not viewable