Revert "Add filegroup support to notice property."
am: 5529a705de

Change-Id: I8e8aa1af18f3f7cb3f0e2fb199138d1102b3a233