Merge "Support notion of ECBM for work profiles." into udc-dev