Adding support for nested field groups

Change-Id: I959ae1ec5cc3a2cbe1d7fd735592f06311f679d3