Merge change 26885 into eclair

* changes:
  Tell the SDK that ApiDemoes requires Eclair preview.