* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5': Merge 2fae858d from Honeycomb-mr1. do not merge.