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

Change-Id: Ia0316f8ec7a92940182ce7f026840138288657b4