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

Change-Id: I19288d72c8821e6534d6b6d149df852e8302451d