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

Change-Id: I4c499d60c5ac213fe6d351dce98f4d587d6bccdf