Merge "Revert "Fix inconsistencies of ConfigInfra module bp file"" into udc-dev
tree: 86416b3b2a44fa9b9d13c6f41670b907ce8d6cad
  1. apex/
  2. framework/
  3. service/