Ready for PA preference

Change-Id: I5f4c30521f938ba90f4787e07b61f510e75b13ce