Merge "Whitelist FullBackupDataOutput" into pi-dev am: ff964696a1
am: 71f865559b

Change-Id: I2f2b884e51cb031919e66ef99c6d63b7d5e2de70