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

Change-Id: I00677ec99337440037be6467486564213714bce5