Merge changes from topic "ims_apis" am: de65acb915
am: 77230a0b3f

Change-Id: Ifd9a6ee66dae58dc3c1bfec6d7d6eed4f64a6b72