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

Change-Id: I199da6b0dd063c610649f2275916ca907d6ed7d4