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

Change-Id: Ib16f22466459b5a294cfab5d020f64aad11cecfc