am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer...
am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev
* commit 'ff363aa9':
More on issue #7318666: hide developer options from user build