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

Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a