Fix compile errors due to OPP merge

Change-Id: Ia07d99d58785c7e974b1fb32afaeb157ad337932
2 files changed