am 0915d0aa: am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo

Merge commit '0915d0aa9c13b365d48c6868ac47913ecd172d07' into kraken

* commit '0915d0aa9c13b365d48c6868ac47913ecd172d07':
  docs: resolve doc bug