Merge "Add safe union for cpp-only test." am: 2ee4fbc6ad
am: 561414bb3a

Change-Id: I62adfff157e05f6f87325c87f12760b3e3fcbeba