am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files...

am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit '878acada':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs