Merge "Add missing response function." am: 6267062af5
am: b3e6021641

Change-Id: I0ee6a5540ccbd40c6c11b4f42b8d6cae26629da4