Merge "Don't let toasting throw a runtime exception." into oc-dev am: 4b0d2bf70a
am: d5d6f3e88a

Change-Id: Iba0bf5320f8ccd53d261c057cd7dd3314bcca300