Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
am: b97196b1de

Change-Id: Iadfe22122e0d449991c5f0e29f2882dafb6de64f