Merge changes from topic "ims_apis" am: 27f0897068
am: 08b0b2771a

Change-Id: Ia72994976f040097ae659232e56697ec6ba6e7e9