Merge "Improve SimPhonebookContract javadocs and qualifiers"