am 2b847c39: Merge "Removing unecessary additional lock metadata from...
am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
* commit '2b847c39':
Removing unecessary additional lock metadata from QuickSettings user tile.