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