Merge \"Merge \\"Merge \\\"Fix guts are not bound properly.\\\" into nyc-dev...
Merge \"Merge \\"Merge \\\"Fix guts are not bound properly.\\\" into nyc-dev am: 9ea39160\\" into nyc-mr1-dev am: 1ecbced5\" into nyc-mr1-dev-plus-aosp
am: fe103d3e
Change-Id: Ia221db5bd46268be2335e139796838ac6d622809