Merge branch 'tizen' into security-manager