Merge pull request #12256 from cctuan/903919

Bug 903919 - add support for large device(cherry picked from commit 77b1393ee3a7db1550daafa7ae855bc8094b9c72)