This reverts commit 6ff778c951. Reason for revert: The patch cause regression issue on b/228932000 and b/228935134, revert first. Change-Id: Ibbe3dafd529aa6daf48854b5af2fd08b41deacf2
6ff778c951