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

Change-Id: I631f8095b8bc8e9b08e74fafdb4280ac6fb46489