DO NOT MERGE: Don\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4  -s ours am: 41821a26a5  -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf  -s ours am: c61f35ed9a am: 34fb87b519
am: 1a450675f3

Change-Id: I5fef884dbf640b60c1bf4c28a6d95abb4d42061b