Merge "Fix failures of BYOD Managed Provisioning" into marshmallow-cts-dev