Merge "Gate toast block and remove warning" into rvc-dev am: 7afc8b101b am: 5373637239 am: b66102a871

Change-Id: I9ef5c7ba74c821a12acda272b452be2b1f33b791