Merge \"Preemptively add string for possible toast.\" into nyc-mr1-dev
am: ec2ea47ead

Change-Id: I1f2578e51ae244de2a68ea72bf0bd0dd8f7e4b11