Merge "Update string value for provisioning action and extra" into lmp-dev