This reverts commit dcb3c6559b. Bug:72511998 Change-Id: I665966ca109f66f85d8665db388c71ea2303c3b8
dcb3c6559b