Merge branch 'sandbox/kjackiewicz/samsung_devel' into tizen