Overlay fix for PA

Change-Id: I8b439df5c28555f01cfd95fc995e9e18dc07add0