am 07791574: am 3e41588b: am d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev

* commit '0779157434a7b4ac8842f594a37dbda2079311f3':
  Fix Google Now on lockscreen.