Merge "The "net.change" property is no longer needed." am: e209ed7c44 am: 422a5128dd
am: c466ad5df2

Change-Id: I7a03530855ffe0e13967c87b42f3caa3c2a856c9