Merge "Minor refactor of ChangeReporter and PlatformCompat"