Merge "IMS: RTT interface changes" am: 814fdf9312
am: bc56b97770

Change-Id: Ia4f93347b8bcc668344ce78055c17a691dad4237