Merge "ISafeUnion: add case w/ enum"
am: 9667078a6c

Change-Id: I81f84490d7b0949c4949c00ec0e0c81af5403102