This reverts commit b94c4e7453. Reason for revert: b/196387077 Change-Id: I8e27ce915b6069b642c614a018aa5e1788ae07af
b94c4e7453