Merge "Propagate errors through trap"
am: 100125479b

Change-Id: Ia2ce73819f983fa0106ce4cc3a0c5436f30bf98f