Merge "Show warning message if sideload failed or is interrupted." am: e1d76ef395

Change-Id: I1f87047c256d49cd498e545b4899528c9d5a0ed3