Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev