Merge "Use the new root cert file under the core/ folder" into pi-dev