am 44ca7090: Merge change 25356 into eclair

Merge commit '44ca7090aca79b8c8e71d34982ae54b69968ad56' into eclair-plus-aosp

* commit '44ca7090aca79b8c8e71d34982ae54b69968ad56':
  Filter out failing cases for future investigation.