Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into oc-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: f078f78b am: c362717c am: 2c274283 am: dbb066ba skipped: 2a55f16e
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: f078f78b am: c362717c am: 2c274283 am: dbb066ba
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: f078f78b am: c362717c am: 2c274283
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: f078f78b am: c362717c
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: f078f78b
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr