[automerger skipped] Correct the bound if it's from outside of screen am:...

[automerger skipped] Correct the bound if it's from outside of screen am: a67e14a6 am: 86e825ac am: 46536afa am: 8c14074b -s ours
am skip reason: Change-Id Ie2107f58a7cc5f0b76e4a468cfb295c410dbb559 with SHA-1 9a341abd is in history

Change-Id: I941359774f55802266faffb81bfa2eb9ba0334cb