Endeavoru wifi and data fix

Change-Id: I9eba34b7231e6744c14139156424fbcf451c6322