Switch some feature to MoKeeServices (2/3)

Change-Id: I0cba5223b7ed93c746da36d52fa93a975801ef4c