Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev