Merge "Add attribute to fix build."
am: 0e8dc13ea6

* commit '0e8dc13ea6bed3a31a7244cf9fb8b8497b27507a':
  Add attribute to fix build.