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

Change-Id: Ibac7e6c1aa60ee926e7244ddf444dd48c1387943