Merge "Disable 677-fsi2 on RI."
am: ba345bfefe

Change-Id: Ib6ebb08ae0549199e7959fb3fd74c2add1391929