Merge "Enable LPP_CP as default"