Merge changes from topics "ut_provision_api", "ims_prov_api_defs" am: 3fc958475b am: 1e6ed3c5eb
am: 270fe0a1f9

Change-Id: Id9c04847789ac612b6de7ddea15292936a6f24c8