Merge remote-tracking branch 'cm/cm-12.0' into L5

Change-Id: If77b5f41109eb81edfec3a504e2e868e39b2175f
Set net.tcp read/write buffersizes

Change-Id: I0d36ec311e6822ea9c199acf62b041b254277894