servicemode is in manifest now

Change-Id: I74804f99f5d212b342aeaa433b5562a765e318c1