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

* commit '3ef8f64d3faac1b110c737e69472be710d07d158':
  Fix missing clock in keyguard