Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1