Merge changes Ie5b66d6c,Ia1004ca6

* changes:
  Revert "Otapreopt: Work around bug 38186355"
  Clean up possible null dereference warning.