Merge "Disable 677-fsi for jvm." am: cbc5471818 am: 84c0a46eb7
am: 1fa46615d4

Change-Id: I3c2682c84281a002c1ac003bff801d69e3a1e775