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

Change-Id: I60f4f99b718c6c301a7034ca1db069ad07a890ca