Added todo items for a potential metrics issue am: dc5a63bdd1 am: 94f2fe22b4
am: c92cb8b816

Change-Id: Iad996bf83a9d1766f4b5dcb90d71f20488491aac