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

Change-Id: I7957e3c42100f51f5bd4de1db16b6d396527524c