This reverts commit ae3d303344. Reason for revert: this cause GTS fail Bug: 238038401 Change-Id: I3e21321e931f60208cb0befaed38e58b088ff966
ae3d303344