Merge "Merge "Add missing usage to buffer" into android11-tests-dev am: 7368843709" into android12-tests-dev