am 5c58a916: Merge "Fix missing clock in keyguard" into jb-mr2-dev

* commit '5c58a916f6b10652af02aa357ceb70ba2cd18363':
  Fix missing clock in keyguard