This reverts commit 1f3b0302fd.
Reason for revert: broke SDK builds. See ab/4976218
Change-Id: Id532e20eed8e13735a09cca5affc92005b685744
This reverts commit 1f3b0302fd.
Reason for revert: broke SDK builds. See ab/4976218
Change-Id: Id532e20eed8e13735a09cca5affc92005b685744