Merge changes from topic 'call-session-may' am: 21e4dbb6ed am: 63769af59d
am: 347e5ff103

Change-Id: I1a53bf75715c4d7d1b2fbd7ebf6dc96c06b78a2f