Merge "Device policy: consistent javadoc and annotations" into mnc-dev