Revert "Add filegroup support to notice property." am: 64f1668eaf am: 6796a4d25c
am: 9ffb14fc21

Change-Id: Ida55995950f3cc20c9be31ed14e239f7c0a2c4b0