Merge "Don't crash system server when setting scheduler." into nyc-mr1-dev am: 2f917df4be am: 90969ebf82
am: 967f40c688

Change-Id: Ibc8b6722857547c0f9ff6aa2d361b4d5f58ff9e7