am 33dea30b: (-s ours) am 0777558f: Merge "DO NOT MERGE Respect the "Make...
am 33dea30b: (-s ours) am 0777558f: Merge "DO NOT MERGE Respect the "Make password visible" setting." into jb-dev
* commit '33dea30b':
DO NOT MERGE Respect the "Make password visible" setting.