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

Change-Id: I95c6f25ce33d9778dde668e807de38f6fec2c8ea