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

Change-Id: Id5fa48bb00e1577c51245fe863f4132dd3cdb87e