Merge "Make CustomPrintOptionsTest more reliable" into nyc-dev