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

Change-Id: I733eaa709c95dad44a144b29bbd071105c9fae93