Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread