* commit '02a400ca6e5a185906b743c379716f9315e03bb2': Device policy: consistent javadoc and annotations