e610 fix up and everthing is fixed

Change-Id: I8b894a3ea4d68fb54c0f0aef6d75b99be04d77da
Merge "e610 fix up and everthing is fixed" into pac-4.4