Merge "Merge "Remove TODOs that are not needed" am: 0f984230 am: 5c2cfc51 am: 444616f4 am: 34aca9e2 -s ours"