Merge "Update the location tracker test app"