Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev
am: 549a822331

* commit '549a822331a522cabfb854b91b1cad5a0f7128ae':
  Fixed a bug where the positioning on the lockscreen was wrong

Change-Id: Ia1a7619019069599fcde4f3002e44517bb7d4572