Merge "Fix failures of BYOD Managed Provisioning" into marshmallow-cts-dev
am: 3ea99340f1

* commit '3ea99340f1db5651e014dbe3bdddcdf89275ece8':
  Fix failures of BYOD Managed Provisioning