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

Change-Id: I6b828ef65e4b3bbf22f7ae0b9bdbd5561ec4b26b