* commit '805402de76dc983b2b785d77531f81ab6eea5f87': Device policy: consistent javadoc and annotations