Merge "Propagate exception to error code" am: beaa7e2488 am: 046af36885
am: f030edafda

Change-Id: Ib590f19bcb6417c8449c030dd7526580a5cfe153