Merge "Disable 677-fsi2 on RI." into pi-dev
am: 19ae589fa3

Change-Id: Ibad19efe2b0b7fbd015458cac19767bb24737389