Merge change Ic77859c7 into eclair

* changes:
  Remove flaky ApiDemos tests from continuous.