Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev