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

Change-Id: I6f3b49aa4e2773bd22a77fe67e04abbd3b13b0c3