Merge "Prevent definitions of expected.h from being included twice"
am: 99087decb9

Change-Id: I74124ec1ca8b4b43cdd0cfdb17bac2402c9f3b4e