Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into nyc-mr1-dev
* changes:
[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