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

Change-Id: I6c2ef27d9cb1996234b7d877fb88d7e7e7b1ba83