Merge "Remove service defined in an APEX during userspace reboot" am: abd504611b am: 29f1311635
am: fac4897053

Change-Id: I085854aa56c7b3c8556856013bfd3f476aedb086