Update E3Experiments to master

Change-Id: I975c481d6922810ab7e0a52a16aaef37967930be