Relies on I5d894f8a in MW core. We'll need to update our wfUseMW when that gets merged. Bug: 50747 Change-Id: I35e55658a3990121afe4d996ef4ee06547d2aa0c