Reconcile documentation updates from gingerbread to honeycomb. Change-Id: I8c199906beb5cd3c290ded123d6aefd0d1697f30