Follow our own Common OpPo

Change-Id: Ibd090103da36b960b23d70e759b28e60627cdd95