Merge remote-tracking branch 'rsa/tizen_2.2' into tizen