Merge "Allow incremental replacement of filegroups with stubs source"
am: 25843c7670

Change-Id: I65b0e0969f011ba8ca229a8a1f11c7189bdd68c5