am 3c9376b3: am d0f19930: Merge "Make sure settings writes are permission...
am 3c9376b3: am d0f19930: Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev
* commit '3c9376b3':
Make sure settings writes are permission checked correctly