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