Merge "No blame for location usage if no location sensitive field is queried" into tm-dev