This reverts commit 9fa9fc8bc5.
Reason for revert: Break Android tests.
Change-Id: I40bfba94ef1a8a5991feedfd24122ff45ba37912
This reverts commit 9fa9fc8bc5.
Reason for revert: Break Android tests.
Change-Id: I40bfba94ef1a8a5991feedfd24122ff45ba37912