Merge \\"Added todo items for a potential metrics issue\\" into nyc-mr1-dev am: a4e616e0dc
am: bbdd486b3c

Change-Id: Iaf932a0c6b9a7497ac56a82eed91ce96dbbba6ae