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