Merge "Make sure PrintDocumentInfo is always sane." into nyc-dev
am: 4f05eb1

* commit '4f05eb194cf3f2c7c518d643d29906d4c7d246de':
  Make sure PrintDocumentInfo is always sane.

Change-Id: I48ac9dce7a84a9926b3756f0f190d05799ffdaad