Merge "Correct permission name in javadoc" into tm-dev