Merge changes from topic "ims_apis"
am: 27f0897068

Change-Id: Ia5b69d632dd37d2e0e0df1e5d6b596cd882ba877