am 8e42d39f: Merge "partial inval" into honeycomb-mr1

* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
  partial inval