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

Change-Id: I7f203ef9c086e218c0fa900d322e9aa22c5a0d39