This reverts commit f9933b7d. Reason for revert: b/185482967 Change-Id: If0700210ce79b42cf8e80946a6c23b82ea99469e