Merge "sig_pri: Address gcc9 issues"