diff --git a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java
index 060008ff712..0d90b4b1c2e 100644
--- a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java
@@ -744,7 +744,7 @@ public class TimeZoneRuleTest extends TestFmwk {
     };
 
     private String[] getTestZIDs() {
-        if (isVerbose()) {
+        if (getInclusion() > 5) {
             return TimeZone.getAvailableIDs();
         }
         return TESTZIDS;
@@ -761,7 +761,7 @@ public class TimeZoneRuleTest extends TestFmwk {
         if (idx < TESTYEARS.length) {
             loyear = TESTYEARS[idx][0];
             hiyear = TESTYEARS[idx][1];
-        } else if (idx == TESTYEARS.length && isVerbose()) {
+        } else if (idx == TESTYEARS.length && getInclusion() > 5) {
             loyear = 1850;
             hiyear = 2050;
         } else {
diff --git a/icu4j/src/com/ibm/icu/util/VTimeZone.java b/icu4j/src/com/ibm/icu/util/VTimeZone.java
index 4dc55a1f3ab..dbd50470ac7 100644
--- a/icu4j/src/com/ibm/icu/util/VTimeZone.java
+++ b/icu4j/src/com/ibm/icu/util/VTimeZone.java
@@ -24,7 +24,11 @@ import com.ibm.icu.impl.Grego;
  * With the <code>VTimeZone</code> instance created from the ID, you can write out the rule
  * in RFC2445 VTIMEZONE format.  Also, you can create a <code>VTimeZone</code> instance
  * from RFC2445 VTIMEZONE data stream, which allows you to calculate time
- * zone offset by the rules defined by the data.
+ * zone offset by the rules defined by the data.<br><br>
+ * 
+ * Note: The consumer of this class reading or writing VTIMEZONE data is responsible to
+ * decode or encode Non-ASCII text.  Methods reading/writing VTIMEZONE data in this class
+ * do nothing with MIME encoding.
  * 
  * @draft ICU 3.8
  * @provisional This API might change or be removed in a future release.
@@ -53,7 +57,7 @@ public class VTimeZone extends BasicTimeZone {
     }
     
     /**
-     * Create a <code>VTimeZone</code> instance by RFC2445 VTIMEZONE data
+     * Create a <code>VTimeZone</code> instance by RFC2445 VTIMEZONE data.
      * 
      * @param reader The Reader for VTIMEZONE data input stream
      * @return A <code>VTimeZone</code> initialized by the VTIMEZONE data or