Merge "Add more detail to javadocs for SimPhonebookContract"