Merge "Update API txt following a metalava fix"