Merge "Revert "Exclude GlobalSettingsProto from coverage to fix the build."" into pi-dev