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

Change-Id: I2b46259be44dec6ec66f910956b14e6ff187e4f2