Merge "Otapreopt: Work around bug 38186355" into oc-dev