Merge "Remove obsolete workaround." am: bf925b0580
am: d6f56bc777

Change-Id: I33e109175c1a86a68ff06a7fad870cb55fb133df