servicemode is in manifest now

Change-Id: I297fe8ce9fbc29c70d516866ee00ff7a15ca923f