Merge "Otapreopt: Fix count" into oc-dev