Merge "Remove unused filegroup" am: 3ff1caf424 am: 281f4e4ef9 am: f4255ac0d6

Change-Id: I67ad167574d85124ee5595b321a522be81cb8dcf