Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
am: 46c0bc9407

Change-Id: I9640adc59d47dbbb36183073a1c6bc2d0624d893