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

Change-Id: Icc0d7b46f0777fd998c5fae5b5796bd99cac5ace