Merge "Change 677-fsi check script to only keep messages it cares about." am: e58709d045
am: d1dad92528

Change-Id: Ifa6c21b7fcd4425a73b31ebe16593bc368756647