Merge changes from topic "ims_apis"
am: de65acb915

Change-Id: I717387907dde9f10fd61bbeb20e3533aeaeab220