Merge "Fixed tests for TelephonyBackupAgent" into nyc-dev