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

Change-Id: Ic108caf282809306a6f70e009055f6bc91b352c0