Merge "Disable 677-fsi for jvm."
am: cbc5471818

Change-Id: I3fd7e7d3f21c8d66e276f9d8ce258111ad33cfc2