Merge "Don't crash system server" into oc-mr1-dev