[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: 208a16fd -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf is in history

Change-Id: Iee5ef697cc117143b8a0d0c4ae5041ad7972ddf2