Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev