Merge "Disable OPP for fugu" into lmp-dev