Merge "Do not cache enabled tags in Java." am: e280c89075 am: 2dcd338a46

Change-Id: I631b07420837c5271e2162c98d6f2c5150a8528e