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

Change-Id: I9532a0d5901f03619f0b6a277464e16e1e5486fc