Merge "Docs: Updates to backup documentation am: f0968050f6 am: 233f52d92b" into nyc-mr1-dev-plus-aosp