Merge \\"Fix off-by-one in am start -R (repeat)\\" into nyc-mr1-dev am: a3fc533d77
am: 0abc10769d

Change-Id: I170d705d80a5d577646ab3ee1971f26a0ace057f