This reverts commit 15529d31. Reason for revert: causes crash at ToT Bug: 130840078 Change-Id: Iee8a968afe385fff35f9db4e3a628f0592ee9a5b