This reverts commit cbe2f1bf. Test: NA Bug: 72116995 (cherry picked from commit 0d3c8bac) Change-Id: I1edc9a03f9ff3c655a8ebc2d181aaf8366aeec0b