Merge "Use the new root cert file under the core/ folder" into pi-dev am: 82235880f6
am: 518b7de5af

Change-Id: If4e987b389c529cce4c0e252e100d7d84b5579cf