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

Change-Id: I23d777395071ba3e302bd10f29b9c896271f64b2