Merge "IME API: rename IMS methods." into pi-dev