* commit '34f5991ebe8b203f1720caf95889c15dd131d86e': Merge 6103e22c from honeycomb-mr1. do not merge.