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

Change-Id: I1a779203012617991be1669b14d3466badc0cbd0