Merge "Remove e2e layer"