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