Merge \\"Better diagnostics from \\"adb sideload\\".\\" am: edd401e24e
am: c63439ae7f

Change-Id: Iba368cdb974292d8e2cce1cfac7a96ef93809e1f