Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev