Merge "Change last-released filegroup" into rvc-dev am: de9867d3db am: d7145f2eb8

Change-Id: Id96874510c98309af685f2420cae04ab4e19506c