Merge "BufferQueueProducer: Slot may have null buffer [2/2]." into rvc-dev am: d3a385b3dd am: 93c8a6f226

Change-Id: I10a7a701af561185528bf47a58789f38d24e1830