am ed64c3ff: am 95b087fa: am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

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