Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev am: d9eb4fce7d
am: 25946b8d69

Change-Id: I5b687aa68de13a21fc9ae11ca1ab80754096b543