Merge \"Fix guts are not bound properly.\" into nyc-dev
am: 9ea3916063

Change-Id: I3adc7f367792e30bdf61067ea367436a22ef5842