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

Change-Id: I5d3132d6b8c2ae69bb808350dc81786774bdc3ea