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

* commit '34c1df3a154abb8bd495f74f5e53b91e7956e596':
  Pass correct extras to the custom print options activity