Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into...
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev am: d48bd27f am: 6a2ada0a
am: f5d0bbe9 -s ours
Change-Id: I5e7a93c0149f06b5f62e20dc66f8e2873bdadb61