Bug 903919 - add support for large device
Merge pull request #12256 from cctuan/903919

Bug 903919 - add support for large device