Merge "partial inval" into honeycomb-mr1