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

Change-Id: I1af3a999dd6e04ec155ec6d1a833157ae831ce08