Merge \"Prevent PrintSpooler from being disabled\" into nyc-mr1-dev
am: 2d8c91f238

Change-Id: Id3e78a8e097e000cbfae5be1c4991f16d09a0e0e