Merge branch 'samsung_platform_data' into staging/for_v3.7