[maintenance] Fixed failing test after bogus cherry pick

Change-Id: Id6a35fa037801018c07e001f938ad82701c1968a