E610 support

Change-Id: I50bb0f5c4ac60fa2e6ff266b653b540e2986a93e