Merge "Add additional fields to RecommendationRequest." am: b8f0e69e am: ac05acad am: b7b9c6f8 am: 746a4de6 -s ours Change-Id: I542c5562210e309bf17c235225051ab42c8d0f65