This reverts commit c4356fb7. Reason for revert: Regression b/72800226 Change-Id: Iaa14de444c00a9da7c3b3a6d8828f40d66a8ac29