Merge changes from topics "ut_provision_api", "ims_prov_api_defs" am: 1a705baf04
am: ce55f58aab

Change-Id: Ifb2d8f89378ce1991e15a60186d5dffad450f404