Merge "Remove obsolete workaround." am: f448371208
am: 365604c300

Change-Id: Ia153c371b8833b926b3e643bf265e67a438dfd91