Merge "Address missing variable definition to fix the build."