Merge "Fix broken BufferHubQueueTest.TestRemoveBuffer" into pi-dev am: b900363e9b
am: f974b9d940

Change-Id: I9fc1d3958a88da8c77e746b131756af9e69d9f18