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

Change-Id: I8978296b42e6a809543fd92fc08a853ec910c084