Merge "Fix test that broke when number of ADD inputs increased from 2 to 3." into oc-mr1-dev
am: 2f4f5bde68

Change-Id: I94b48274f76ac0b0b2a823a33a7fa516cda0f32d