This reverts commit 05dc947c63.
Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189
Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f
This reverts commit 05dc947c63.
Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189
Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f