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

Change-Id: I955ef5ccd83ade7ccd14b342baa9c110a103cd2d