Merge "Output diff result to stderr" am: aa2b5e1a70 am: 536c1f9d63 am: 10865e3bac

Change-Id: I49ba377b53c3e2982310992228b817b36d558801