am 813d2383: am 00dc15d9: Merge "Add a settings icon to restricted profile...
am 813d2383: am 00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
* commit '813d2383':
Add a settings icon to restricted profile config header