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

Change-Id: Iafb59f82cc7165bbdb0ad55190ddf12c5d6194b3