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

Change-Id: I3fa265e516b958f23e916fcf6fd702707cd1969f