fcd569055e
This reverts commit b0e0f5f44a.
Reason for revert: This cl prevents the ability to run tests from android studio.
Change-Id: I8a1cbcd2e8faefdd168aac5bcad4f21c73694839