Merge "Add safe_union@1.0::Monostate." am: 6f7ad83248
am: 70ca0f3b01

Change-Id: Ia0d6e0ee3d3950865f34e0dd1c475df135faf556