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

Change-Id: I7d9876ddc195840bbab12d1847f6cad3c88b3630