Merge "Revert "Update the location tracker test app""