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

Change-Id: I04210be80e2922ae226f5fdb7ec14b47c591315e