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

Change-Id: I9c95caa9a7bf0949679809aaa490327795fa981f