Merge remote-tracking branch 'location/tizen'