Merge "msm: Change the permission of 3d barrier sysfs entry" into msm-3.0