On a CE the general.process_handler is always set to 'none'. So we need
to take this into account and mark it as enabled.
Change-Id: Id1347ac027412861a1319a95d1537aaeb778bf6a
(cherry picked from commit d03cb1fd71)
(cherry picked from commit 3efb11e1a3)