Merge "[DO NOT MERGE] Remove toast window immediately" into nyc-mr1-dev
am: 821dd78512

Change-Id: I58faf8f6ef0fbe1d1ae7d8c6461655b518faabfb