am 8842cfe4: Merge change Ic77859c7 into eclair

Merge commit '8842cfe4a1f190906c99896992d1bbb7b144fb90' into eclair-mr2

* commit '8842cfe4a1f190906c99896992d1bbb7b144fb90':
  Remove flaky ApiDemos tests from continuous.