Merge branch 'topic-0620/samsung-gscalar-3.4' into chromeos-exynos-3.4