Merge "Remove unnecessary TODOs" am: a5c96cf4bf
am: 08cff4c76b

Change-Id: I2682cc46391b6120ac846c011bee0eab30c55e86