Merge "Update API txt following a metalava fix" into sc-dev