Merge "Add permissions javadoc"