Merge "chore(errata-abi): minor variable rename" into integration