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

Change-Id: Iac3cd7f26b7a6e7134b9de6b34cdddb2b3e72d4e