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

Change-Id: Ic549647df21c282c5ec4cb82ab71de10ad5b4b4b