e610: updates for evervolv

Change-Id: I367641af092a0d01eddb62b333b66cbba3b11d0d