This reverts commit 2bdc0b2b72. Reason for revert: T166010#8349431 Bug: T166010 Change-Id: Idcd3025647aec99532f5d69b9c1718c531761283
2bdc0b2b72