Overlay fix for PA

Change-Id: I0f23bec8b7f69e265cd5bf5ce49233e202767cdf