Merge changes from topic "ims_apis" am: 27f0897068 am: 08b0b2771a
am: bfe27b6dd2  -s ours

Change-Id: I668258db183a277a15fbd6a5aa911447fa4c5077