Merge "Add IMS Registration Integration" am: f771575a81 am: 930509aa5b
am: 687abd256d  -s ours

Change-Id: If6e1653d7d9498457a9f5de7279dc63e97d81850