Merge "Fix javadoc for preference lib" into mnc-dev