Merge "Omit default values in JSON dumps"
am: bed6b4feb9

Change-Id: I4d29a2b576ed9441600ef6e55fc9fd22ac671da8