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

Change-Id: I53ec7b243b161718ef11bf7d24f00b8328b2888c