This reverts commit 0619545b. Bug: 29497152 Bug: 28518380 Change-Id: I8684b731b1e9973ead7066dc650eff720f70ac91