Merge "Add attribute to fix build."