[automerger skipped] Merge "Do not cache enabled tags in Java." am: e280c89075 am: 2dcd338a46 am: 08135b313a -s ours
am skip reason: Change-Id I1a07fefd751ee28ca9a632a3d78a2925e8827b9c with SHA-1 9fd210224a is in history

Change-Id: I4108fdd80d8cedb0cb79259ad84ca2f35b66349d