This reverts commit b9dc1c2991. Reason for revert: http://b/299624573 Change-Id: I0d5993295df65ec31c180b6b5a76fbe939891f45
b9dc1c2991