am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as...
am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
* commit '37fd8bd1':
Marking some globals from setGlobalSetting as not supported