Merge "Upgrade E2 to API spec 20190611"