Merge "Change ProvisioningManager API as per review" am: 54fffdc876
am: 8dd52036bc

Change-Id: Ic4b23f973e880563a25be6daf7f482504a1326c6