Merge "Remove enable_restricted_bucket flag." into udc-dev