Merge "Remove redundant filegroups for last released" am: 48cb8756bf

Change-Id: I4a31967f37db09ad0924e6c4b63bf1cfb8eaebd7