Bug 828196 - Workaround bug 823418 in Gaia, r=timdream
Merge pull request #7431 from yurenju/issue-828196

Bug 828196 - Workaround bug 823418 in Gaia