Merge "Remove obsolete workaround." am: c0c4c4e5c4
am: 1e91d716f8

Change-Id: Ie68abd7d74530609d7602d19a041f27821a701ad