This reverts commit 5c4e7b81. Reason for revert: <b/146461873> Bug: 146461873 Change-Id: I8bd10333f2014e52e1d3122c5b9dc895a5d6c658