Merge "Make VZW volume for CONFIG_MACH_M2 only" into cm-11.0