servicemode is in manifest now

Change-Id: Id019e1702c5c223ed81443ac8b591688234f6547