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

Change-Id: I4afa65416d1ba389c215cf891fac4b658ea6e168