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

Change-Id: Ie1cd0988da85a241916cdd710cbcc5a06c647331