Merge "Prevent definitions of expected.h from being included twice"