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

Change-Id: Ib13d06d05f1ccf663f647aaf95b3a546a9d102c1