Merge "Delete dangerous comparison operators from base::expected" am: ab65ef22a5 am: f55fe4193e

Change-Id: I50a6a18f91ace90698bed5c26ce86dcd14ab6264