Merge "Remove obsolete workaround."
am: 3553883418

Change-Id: I2646df37a75e49fb296799ff085339399c7c2084