am 2983bb6a: am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1

* commit '2983bb6a363010403668d39fdc42f5712bff5eb3':
  partial inval