Merge "Fix off by one error." am: 551efd11f7 am: efc71fde89
am: c5bcb5df24

Change-Id: I3d72e86b6bcb79d5d6156664b489229b5b853900