Merge "Disable 677-fsi2 on RI."