Merge "Merge "Fixed a bug where the positioning on the lockscreen was wrong"...
Merge "Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a8223 am: ea2e5bfd" into nyc-mr1-dev-plus-aosp
am: 6bc88d64
* commit '6bc88d64':
Change-Id: Idf5f0cc78de4a1fa90031a46c67f0eeddb237da1