Toast Fixes
am: f62b488f4f

Change-Id: I823d62fa3c8724cfe75e3d11be9b25b621a05253