Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev