Merge "Add additional fields to RecommendationRequest." am: b8f0e69ef0 am: ac05acad45 am: b7b9c6f889
am: 746a4de692  -s ours

Change-Id: I542c5562210e309bf17c235225051ab42c8d0f65