Merge "ahat: Improve field diffing." am: 47686f6233 am: 3814df5f86
am: 7209db3b28

Change-Id: I9e2707db80a4d4bee4cf2a78458c6911461e56a3