Merge "Add Listeners to PlatformCompat" am: e14d7099a9 am: aa7b68930a
am: 9a59952214

Change-Id: I82a6a37dc93ad5d83c61731fa3ec9365d8a522e4