Revert "Revert "Add filegroup support to notice property.""
am: 0a79530fd2

Change-Id: I9282bf87b6949847943756ab5b1962732fa76ef6