Add bug number to a TODO
am: ff72f04696

Change-Id: Ibffe8fafecbdd79eaad37e09d915d4f7d9003cc7