Merge "Add missing response function." am: 6267062af5 am: b3e6021641 am: 63ab2b318b
am: f6f5316460  -s ours

Change-Id: I3dc67d3d85656f768d2acedb24b87a97655c92ba