Merge "Merge "Tweaking workaround to use fallback with null buffer" into rvc-dev am: 5be32a1c11 am: 367b00d197" into rvc-d1-dev-plus-aosp