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

Change-Id: If60d1886cd42d34aed83255e3262b6234645118d