Bug: 32881864 Partial revert of 3acf0382 Test: none Change-Id: Ie749e0ef0a84ff820b1ea445422cf28112d62209