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

Change-Id: I8f90aaaf019fa5552e85d5f992e1929735e163d3