Merge "Remove StructGroupSourceReq" am: c7d27845df am: 4c86c99273
am: 8e29e292a3

Change-Id: I14e115957e4a4c90fdacebddad50cece186a303c