Revert "Revert "Add filegroup support to notice property."" am: 0a79530fd2 am: 4fb64dafcc
am: 789678a59f

Change-Id: If062aa6873889fc337ff3dd587e1cf3e6356a4b6