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

* commit '0e4e61f1d5e375932552218fb871988a3231d421':