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

Change-Id: I8d6e729000df403977d4d79f98eb4bb5bbfe4459