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

Change-Id: I88dece6fe0c24d6da086ed37fb02282dc9411a16