Merge "Fix small issue with previous CL" into jb-mr1-lockscreen-dev