Merge "Wrap all exceptions/crashes while plugins are active" into oc-mr1-dev am: 6bf3564040
am: c6af997d24

Change-Id: I8bf96af722ef517809fbdfd105b2155581ed704a