Merge "Tests for Enum#len" am: 2267c72423
am: 0e878f8b10

Change-Id: I05d3bdebaac0c6a9fba48ca0fa9a2fd5413bf222