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

Change-Id: I8c282b035c1c806754adba519d659bedc76de597