[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: f7b36bb8 -s ours am: 149afc2c -s ours am: ffca40c8 -s ours
am skip reason: Change-Id Ie2107f58a7cc5f0b76e4a468cfb295c410dbb559 with SHA-1 a67e14a6 is in history

Change-Id: I30831066e68654690685894d92672272b855e6b4