[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc94 am: 752d4f8e -s ours am: 4a115b74 -s ours am: 9c0efabb -s ours am: 1b967b2e -s ours am: 87d7d58f -s ours
am: 0166c744 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f is in history

Change-Id: I666adf2cf1c2be05dd9364c49a5fd51bc20f9cc6