This reverts commit dd373761. Test: None, it's a revert Bug: 138952436 Change-Id: Ib809ba017e3563c09ea35b1a9056a6a95f4bdfc2