Merge "Allow incremental replacement of filegroups with stubs source" am: 25843c76 am: f7e1966d am: 4c31b709 am: f48fba4d Change-Id: Ieab55d57601d6671ee8c950971a8a5606788c876