* commit '9aa905416931860cd92364aa2453c6a859785b2e': Device policy: consistent javadoc and annotations