Merge "Add config option to enable/disable pause workaround." into oc-dev am: 93db1a698c
am: 3f71b1492e

Change-Id: I2d66953d5a5defc7eac1f585e706359523e2e0de