Manually merge the changes made in honeycomb-mr2 to get this on the web.

We'd made good changes in both branches.

Change-Id: I64fb4f1ff06da8767c5a6cee9fbcc2b955d6e207