DO NOT MERGE: Don\\\\\\\\\\\\\'t trust callers to supply app info to...

DO NOT MERGE: Don\\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed2 am: f615799e am: 6633a4fe  -s ours am: 41821a26  -s ours am: b1e31ad1 am: 918fb5d4 am: 2149ebea  -s ours am: c61f35ed am: 34fb87b5 am: 1a450675 am: 790c87a0  -s ours am: 02435d24
am: 313dec81

Change-Id: Iaa07eb947fad2fe822964d12275a591ce31fffc4