Merge "Move from getDataUserCePackageDirectory to getDataSystemCeDirectory." into sc-dev