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

Change-Id: I9888ca6d899678334476fda1a2bd9e03054a3a1c