Merge "Update associated with ResponseCache removal" am: d17485bb02 am: c24a925931
am: 835ce403d9

Change-Id: I90033397fa72ba0c3201266847381acd0d309d74