Merge "Change last-released filegroup" am: 016a8a3813

Change-Id: I5d4ed4bca0f51415fbb2a2537726a3d95d36694f