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

Change-Id: I73f26c943519cb9fa41d61821357b051584cbafa