Merge "[WPPG] Separate files of overriding for building different variant" into tm-qpr-dev