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

Change-Id: Ie7acf6e3ed77d28c2d1ccfdb690f559987d3b6cf