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

Change-Id: Ided599265d27f18f649da730345a190c35be7734