Merge ranch 'topic-0620/samsung-vb2-3.4' into chromeos-exynos-3.4