Update E3Experiments to master

Change-Id: I018ddcd43006b39d917f3ce93509e8ba5a2950ff