Merge "Bug 3366885 Remove LVMX switch"