Merge "Add IMS Registration Integration" am: f771575a81
am: 930509aa5b

Change-Id: I9adf04c108782b9afc592ee5968dc02777393ac9