Merge "Use module name as the suffix for apex variant" am: 22b08b4af6 am: 113ce97ae2

Change-Id: Ia5215be674f6b88c17b409b3cb61832116ec496c