This reverts commit c2241a8d. Reason for revert: build breakage b/70040773 Change-Id: I6af098ae20c4771a1070800d02c98e5783999a39
This reverts commit c2241a8d. Reason for revert: build breakage b/70040773 Change-Id: I6af098ae20c4771a1070800d02c98e5783999a39