Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev