Merge "tbbr/dualroot: rename SP package certificate file" into integration