[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe75 am: 4494b9be Change-Id: Ie42e3bd1a03ef61a7229ffa5d099127ee8048d2a