am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

* commit '69f3ec84cf4e9a1bf4c222b88b4413da407331b5':
  Fix issues where the filename is referred to as 'sideload'