Merge "Merge "Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4 am: 08cff4c7" into oc-dev-plus-aosp am: c8eaf5a3" into oc-dr1-dev-plus-aosp am: a09fa61c"