Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: 9b96c10ace am: 7f9619239b

Change-Id: Ie24831f82339ba97ac83cc724efaf0347e7d392b