Merge "Do not block on allocating buffers am: 0a3e784701" into pi-dev-plus-aosp