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