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

Change-Id: I28c1b888c3611262dbbbb48f5b3886b7e41ac56d