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

Change-Id: I212027330aa0b1bfd874a74af22aad87f536b155