Merge "[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq...

Merge "[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 9299b79e -s ours am: 93b87295 -s ours am: a46a18f0 -s ours am: 902f82c9 -s ours am: cca5979f -s ours am: 74709ea3 -s ours
am: c1467fed -s ours
am skip reason: subject contains skip directive

Change-Id: Ib538fd80620df6c41ff005c9ab99305a57070f5e