Add bug number to a TODO am: ff72f04696
am: a886508002

Change-Id: Idf3e97a71b123aba89f5e4d6281a5a964f589315