Merge "Replace the RequestRecommendationCaller if the timeout changes." am: f604580a58
am: 600b816fe6

Change-Id: I0756a2f72df6a9a41bd0c405155318c693d34546