Merge "adding policy-common javadoc"