Villec2: Bring upto 4.4

Change-Id: I54bf6439d874bb9cb21a460e9cd6f3ce1d734694