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

Change-Id: I52499a4186780fe0249e42bddd9c7726529154a3