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

* commit 'a1a1aa3c682215f0ac7251c43f77985b9aced2a2':
  Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.

Change-Id: I6a177370c3fdcf0d81eedc3bc383f389f058b06a