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

Change-Id: I4335a5f347e4cbac21e34b64435fda4421235d31