Merge commit '264348361e0660948a09fe516a535b7c60998def' * commit '264348361e0660948a09fe516a535b7c60998def': GPS: Initialize XTRA support when GPS is enabled
Merge commit '264348361e0660948a09fe516a535b7c60998def' * commit '264348361e0660948a09fe516a535b7c60998def': GPS: Initialize XTRA support when GPS is enabled