Merge "Disable CE access checking for canAccessDataDir."