Merge "Add config option to enable/disable pause workaround." am: 9282d725f0  -s ours am: 1a6b0a8ad3  -s ours am: 9c41a65d0d  -s ours
am: 22ac8f7221  -s ours

Change-Id: I9c206c958adb439c553cf6eba85fc68773617e02