DO NOT MERGE Fix unexpected behavior in SDP am: 6ee3d8e1 am: 24f55d16 am:...

DO NOT MERGE Fix unexpected behavior in SDP am: 6ee3d8e1 am: 24f55d16 am: ea5b563b am: f4ff65dd  -s ours am: 57a76726  -s ours am: 6f092969  -s ours am: 561741cb  -s ours am: 13952b3d  -s ours am: fdabc615  -s ours am: 89c7782f  -s ours am: 8324a6b4  -s ours
am: 6303177f  -s ours

Change-Id: Ia93c63a810914e31a9fd1e1dc7e1da49e59e49dd