This reverts commit b4908e9b. Reason for revert: Not needed Change-Id: I39036d1697804493b92074ee5f40c6779a029aa5 Bug: 162547999