Merge "Merge \\"Improved error handling.\\" into nyc-dev am: bbd27419ac am: 86d648e0f7" into nyc-mr1-dev-plus-aosp