This reverts commit 0d588946. Reason for revert: Suspected culprit for test failure b/206716119 Change-Id: Ibdd0aa783e07df5b41fd804efd175c12a7fe6592