Merge "docs: resolve doc bug bug:2648699" into froyo