am e3a133a8: am b865d578: Merge "Opt-in Settings package to see restricted...
am e3a133a8: am b865d578: Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev
* commit 'e3a133a8':
Opt-in Settings package to see restricted accounts