Revert "Revert "Add filegroup support to notice property.""
am: e5f17d6c0a

Change-Id: I35523e1f145ef7a8bed8fee5525be464a1f23376