Merge "BufferQueueProducer: Slot may have null buffer" into rvc-dev am: 256a877a84

Change-Id: I69aab083605d6a5da811fca89cc08975e17aa764