Merge "Fix test that broke when number of ADD inputs increased from 2 to 3."...
Merge "Fix test that broke when number of ADD inputs increased from 2 to 3." into oc-mr1-dev am: 2f4f5bde
am: 908f0957
Change-Id: I358a8a348a0f4fc8dbddc97cfa2acff8b14e025a