Merge "init: Separate the required modules of core and recovery variants"