Merge "Drop the hardware buffer" into rvc-dev am: 494960e818

Change-Id: Ic3600043f31daba9f4ebe7bd905a12d1eeb722ce