Merge branch 'mnc-mr-docs' into mnc-ub-dev

Large merge to reconnect automerger for docs branch to mainline.

Issue: 28000173
Change-Id: Ie403bcaf1c148c59be3a514613f7f1605146e66a