[automerger skipped] Merge changes from topic "vts_kernel_net_test" into pie-vts-dev am: 1bc6e4fcff am: 03fd483c6c -s ours
am: b9921e93cf

Change-Id: I064bbe244789c8b5e946bc03a72971a95f4b68d6