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

Change-Id: I7bf2fbedce07a63adb16cff7c8a2febf90b606f7