Merge "[GENERIC] follow elalto branches for submodules" into elalto