Merge "Fix listeners not getting called when AVD falls back on UI thread" into nyc-mr1-dev am: 69115b8e29 am: ccc3794f77
am: ed4fcdb689

Change-Id: Ia374952fe88209712ddab5ffc17d5f522163b6e4