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

Change-Id: I9d0e3f0b6c6d278134ceb26435f125b4b9052ae1