Merge "Fix off by one comparison."
am: 3b5dd3e421

Change-Id: Ia0600fe752f20aa74ff365938ae731733da4fdce