enable basic system service features am: 5bd58a7922
am: fb4d2bfaa4

Change-Id: I9de5af9dce69cc4fe385012569e03fc714f28067