This reverts commit b47ade47. Reason for revert: We need this to run location CTS in presubmits. Change-Id: I328a22afd69166f70d0c0987613f524cd3ab73ce