Merge "Force merges to complete before wiping data or metadata." am: 8444dec7ac
am: bc4b39efff

Change-Id: Iac20a6d65d48b2014aea4d118d730e933950e2e1