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

Change-Id: If5bbf71d879484ad21e6e8d1222b31cde404b8af