[Bug 226097] Merge Review: linux-atm