This reverts commit 57015c29. Reason for revert: b/205397250 regression from this change. Change-Id: I7f6166bdda68f5aa2d0a6407f7e47651b98faba9