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

Change-Id: I298d4f7b684aaa2e0b967fbbadcb72e37fa41ce3