Hacks to make p7320 work

Change-Id: If6c86c4fa128d33d2fde488e0d9a06451ea62658
Hacks to make p7320 work

Change-Id: Ifa251b6ab6a7ade519adc80778a420f44fb93fa3