Merge "Update the javadoc on SHORT_SERVICE fgs type"