Merge "Add expected<void,E>" am: bb1b83e325
am: e6d2cca4f5

Change-Id: I5f66768aa5f906d1632a9744ea13d09f3cc49124