Merge "Merge "Tweaking workaround to use fallback with null buffer" into rvc-dev am: 5be32a1c am: b7e27a65 am: 868e435f" into rvc-qpr-dev-plus-aosp