Merge "Fix for bug 3379244, non-eMMC devices don't start all services."