Use correct o-p-m branch

Change-Id: Id1a2415cf4441e75790418a83e318df332d8d103
Merge "Use correct o-p-m branch" into havana