This reverts commit 5d049e54. Reason for revert: Prevent conflicts w/ auto-merging ag/4205743 Change-Id: Idba725e67cb9bf87640f97d627d5571b3ad8b95e