Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev