am db94389c: Fix compile errors due to OPP merge

* commit 'db94389c30d5ad5555a922d28868b119e1c6f2e1':
  Fix compile errors due to OPP merge