Update Javadoc for r10
Merge pull request #50 from google/email-template-fix

Update Javadoc for r10