Switch some feature to MoKeeServices (1/3)

Change-Id: Iefce9af35286706b248ed268399417cd06b9f4f2