Merge "[DO NOT MERGE] Backup account access grants" into nyc-mr1-dev