Merge "Use filegroup" am: f3ffd568ef
am: c4b33b7a21

Change-Id: I4e97bf43baeb6b2b456e2fbd09e1456e860f1d15