Merge "Remove unused filegroup" am: 3ff1caf424

Change-Id: Ie0087c31f65353272b6a6693d8361f9056bb5c16