Merge "init: allow services to have no capabilities set" am: 500b6c0e86 am: 212343f813
am: f51d83921c

Change-Id: I56547a4e62899c7adbaccf1f8dc3825e91ee9bd7