Merge "Propagate errors through trap" am: 100125479b am: 718446ebe9
am: 9168876493

Change-Id: I83fcc9cc1be5cf1ac988f4c3e64bd597214ee44e