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

Change-Id: I691696fa0ffa50c87bb3afb26173f4cc595453a2