Merge "Update associated with ResponseCache removal"
am: d17485bb02

Change-Id: Ib13422c990fb6a188ae8b7e9afb8ae417f4168db