Merge "Use the si_code value bionic passes us."