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

* commit '247820c0a756413986643a0ed9a8d446afc747ee':
  partial inval