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

Change-Id: If62b270ca54aeca613115ea90b88d32a048bdd95