Merge pull request #14103 from mikehenrty/bug-926347-dualsim2

Bug 926347 dualsim2
(cherry picked from commit e2c232208f0177d7a9305a60a6c59e62d98a67a2)