Merge "Make few of the new IMS API methods final" into pi-dev
am: 8e64eee8dc

Change-Id: Iba222fe7e0752b7161e82b77d28dbe636f1bca7a