Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp
am: c8eaf5a3a4

Change-Id: I49dcec61ce9b64cf105b7432d9c73cf5e3edd8e7