Merge "Make few of the new IMS API methods final" into pi-dev