This reverts commit 3b25df9a. Reason for revert: potential culprit for test breakage: b/168789394 Change-Id: Ie042b91c189c026079b040f6609df4c22c70f2cf