Merge "Integrate IMS Registration API" am: 1f00565433 am: f4d3a4d110
am: 7f47f8e957  -s ours

Change-Id: I23f49a34edb4cfee7bf4733f48e0a4b23943240f