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

Change-Id: I56c14b51a953112cac9dc84dfedd71240b040c8e