Merge "Minor refactor of ChangeReporter and PlatformCompat" am: 55d16fac97 am: a8116d930c am: f8f7f29b32

Change-Id: Ic7db4dd118dceb1f8fe618cf341cbf725c818520