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

Change-Id: I2a182cf6e4d66523eda1d76382bc986c4224d110