am 55b47f8d: Merge change 2863 into donut

Merge commit '55b47f8d7523ec0686dabb466cbe0620f5946cfa'

* commit '55b47f8d7523ec0686dabb466cbe0620f5946cfa':
  SDK Updater: Minor change to make composite constructor compliant with