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

Change-Id: I798dc5b56fb8f212153d87e71ac088ba177875b8