Merge "Reformat and update comments" into mnc-dev