Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev am: cff4c5492e
am: 635c42becc

Change-Id: I24513755644e10adb62dda85892570df1b2be6e9