[Bug 225699] Merge Review: dmraid