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

Change-Id: I1ab77906cf35df65e6aeedb6a6888bb041bb7010