Fix UB in class NullOr
am: cf5d7e83fd

Change-Id: I2454d18671088f2509ba7110636a4f754772c965