Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev