Merge "Add comments to indicate code review was done for bugs" into mnc-dev