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

Change-Id: Ic10196ea00806372653d2c0324130b30234fd4ad