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

Change-Id: Ic37f81a2f8617851b50eb6e44f5fb7e9d2e0a1f0