Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread