Merge "Remove incorrect TODO and meta-data." into mnc-dev