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

Change-Id: I7d459a63108ca1034d8003d7f9a7257df52955ef