Merge "Support nested domain-config elements" am: 749501e88e am: b549899d0b
am: 8427d98f7c

* commit '8427d98f7c3d6c1c05d78c5a9202c4110c3732b5':
  Support nested domain-config elements