Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev
am: d48bd27f0e

Change-Id: I9fbbbbe709dbf308fa4b2678ede416e68f59c057