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

Change-Id: I46ef31c53bdfa4793aa00455396dd63330d0061d