Merge "Add javadoc comments explaining SYNC_EXTRAS that did not have documentation"