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