Merge "docs: fix bug 2590728" into froyo