am 4df3c35c: Merge change Ie3890f91 into eclair

Merge commit '4df3c35c741cad228730607c3fa3bc4effa26539' into eclair-plus-aosp

* commit '4df3c35c741cad228730607c3fa3bc4effa26539':
  Fixes