Merge "Revert "Otapreopt: Work around bug 38186355""