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

Change-Id: I79bdfcc5300b4e5fe450d4a8c887cba39e80c853