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

Change-Id: Ic8b695f766165402fd2f66f54efcf30b76b498fe