Merge "Improve javadoc for PRESENTATION_ constants." into mnc-dev