Merge "Bug 5522189 temporary workaround"