This reverts commit 6c5d9a1a. Reason for revert: testing for b/270623927 Change-Id: I625ff474ca1923ba09a20ceb7669f8e371c22026