Merge "Add monostate to optional safe unions." am: 17c437eac1 am: 65f703a3d7
am: 54fa18c160

Change-Id: Iea3ca96117e1747173b8c7589ecdc68970c1ce68