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

Change-Id: Ifecb02604cebdd5ae1a16d996940d11bee920ea8