Merge "Update default value of infrastructure_bitmask in javadoc." into main