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

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