Merge "Update javadoc error: should be gravity, not weight"