Removing workarounds for a fixed bug

Bug: 148422894
Change-Id: Ic6faa173ac5f28c8656daf68ac8304563264afdd
3 files changed