Merge "If backup service is not available, remove Settings->Backup and...
Merge "If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by admin" from search results." into qt-dev am: 2ec2c633
am: 552c9518
Change-Id: I2b8e38c1e7d5fb291d432f83b3631f3cfaa534e5