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

Change-Id: If92bd1e2d89725186634ab0068b86112934bf7e9