Merge "Removing redundant mvsadcost local variables."