Revert "Add filegroup support to notice property."
am: 427271788b

Change-Id: I16fcdb724adaed740c567c76912aa2b49fe7d9c4