Bug 1048711 - L10N with device type follow up
Merge pull request #22607 from shamenchens/Bug1048711-L10NDeviceType

Bug 1048711 - L10N with device type follow up, r=yurenju