Merge "Supported synchronized fixed location and measurement from device files"