Merge "Add Listeners to PlatformCompat"
am: e14d7099a9

Change-Id: Id187394dc3f52f560faac6b9c73dea40119a5eff