Merge "Add tests for two ways to do subtract 1 in stencil."
am: 775784beee

Change-Id: If7467fd72cd99f8cc184666bbdabbb8620060ee4