Merge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5
am: 444616f4bf

Change-Id: I5f4265d738aa3669a0c7acb8df49b454a3e27f9c