Merge branch 'e2ee' into 'tizen'