Merge "Calculate batching param in a smarter way" into oc-dev
am: 20c35e424e

Change-Id: I941b3af48cf7437d71079386ea6e7fc14a05df57