Revert "Add filegroup support to notice property."
am: 64f1668eaf

Change-Id: I7dcc248d66fc1bced0b9c8f525b27228fb1afae5