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

Change-Id: I2ce45e7d918aa59ac6e170b24179045a8f11f359