This reverts commit 224ef137. Reason for revert: b/130908336 - breaks tests Change-Id: I124330a970bfca6a9e2db10415c498a1f45580ff Bug: 130908336