This reverts commit d3c2bc5a. Reason for revert: reland fix Bug: 128529256 Change-Id: I0647d4242406e31348a68ebba328e5f8ad750144