Merge "Exclude unused operands from removeOperandTest" am: d67c1ee89a

Change-Id: Idb0bb93ddc352091afe3cabf4f990bb21d372476