Merge "AssumptionViolatedException is not handled correctly in @After" into pi-dev
am: d046a44459

Change-Id: Ifab86cd726df110575c772e583bd898b687f2b93