We should use PMO macro from public head files. Change-Id: Iac533655e85ef85fe86bae19e0bce4967418cc81 CRs-Fixed: 2251499