Merge "roots.cpp: Reformatting the file." am: ac70ffcc85
am: 922a310d36

Change-Id: I120503c0e8a726abc044344a17bd9e0c584200c9