Merge "Add script for running diff easily" am: 34445d5083 am: f14638387e
am: ef07b2efb0

Change-Id: I42641aefd3f763cd9cb0a8fd669aa5f98499b963