am 58ef5f1d: am dc63edf4: am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev

* commit '58ef5f1db5907209faf1890079f6ee607e38427c':
  Pass correct extras to the custom print options activity