Merge "Increase poll max size, avoid performance issue when batching" into oc-dev
am: 538fa39cf8

Change-Id: I834c6e72498963bbe48299903e12f79b29a7479b