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

Change-Id: I68bd4aac7f1766152fbb976233340737e6e02ee4