Merge "Show diff column for fields only if diff is enabled."
am: f40efd14aa

Change-Id: I44d7bb70641c7da90e7a26b8f9602c43241c7d54