am 1878d080: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev

* commit '1878d08046784517d3eedd47993e4a4f8c9a98bd':