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

Change-Id: Ide9a861d5db82dc8f83516ed0b340cf7468856e3