Merge change 22346 into donut

* changes:
  Fix target for ApiDemos (API is now 4)