am aed8f216: am c87d5849: am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo