Merge "Added a NETWORK trace tag." into nyc-mr1-dev am: d8ce1bf1ec am: 244565eef9
am: db8d49f3d8

Change-Id: I1fea4951bb08a499198ba355a00a36b5feea08f9