Merge "Otapreopt: Add missing function"