Merge "Remove obsolete workaround." am: 3553883418
am: 5cae04313e

Change-Id: I4a288b5b4666192f7fbc39da461ce63f95fc8849