Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
am: f10fcafcdf

Change-Id: Ib5a821f92aefb4200ab2aef958813d38820bea74