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

Change-Id: Id4f5ac2c9b3cfdfef68a5f058633f57b1ab7246f