Make final product compliant with PA

Change-Id: I08b32d7cdf93b7b9caf3d3271d62eddd8adb4889