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

Change-Id: I79b3499aac4b9926aeab8b6b5f722f80ecfadf90