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