This reverts commit d20eacc0. Reason for revert: This CL was an error. Bug: 143519689 Change-Id: I07320f981c0f97615d4c9d312e62b200dba24983