This reverts commit d133917e. Reason for revert: reland fix Bug: 128529256 Change-Id: I950bc2f7e694dfcfe28e3379727079dde4ec7627