Do not block on allocating buffers
am: 0a3e784701

Change-Id: I1a965d4a5ffe50724b27d23505b9dd686e135614