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

Change-Id: Ieab55d57601d6671ee8c950971a8a5606788c876