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

Change-Id: I848961116ffaf399a9880bafdee0f4943d458948