Merge "Updated assets." into jb-mr1-lockscreen-dev