Help cure Lokesh's OCD

Change-Id: I2e4444d95657145ebfb25750975ed1c4ce3cfd14
Merge remote-tracking branch 'pac/pac-4.4' into pac-4.4