This reverts commit f75775ea. Bug: 28885989 Bug: 28468120 Change-Id: I6fa5401c8a76db1bacc2d8201eece91a3c52b758