This reverts commit 5690b602. Reason for revert: All pre-release APKs were updated Change-Id: I4187cc2653157bcd1584c547f57e034e28d57fb7