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

Change-Id: I9cfe5296ccbe8543579ad08070d9e3b346dd7b2d