Merge change 22988 into eclair

* changes:
  Only add model in the UA for the release build