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

Change-Id: Ifb60e491d53fcb8b8cd49bb0fdf7aa09e8c81e6d