Merge "Gate toast block and remove warning" into rvc-dev am: 7afc8b10 am: fed3f548 am: 3b433c13 Change-Id: I1727d9eaac1fc8ce0f5b5e28bdc9a69689f2cf16