Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread