Merge "Fix listeners not getting called when AVD falls back on UI thread" into...
Merge "Fix listeners not getting called when AVD falls back on UI thread" into nyc-mr1-dev am: 69115b8e am: ccc3794f
am: ed4fcdb6
Change-Id: Ia374952fe88209712ddab5ffc17d5f522163b6e4