Merge "Additional tests for enum iteration."
am: d10cb041bc

Change-Id: Iad74708585a7cfbb97c9932ca7e1c3a8c2315749