Merge "Addressing a couple comments on previous CL" into jb-mr1-lockscreen-dev