PA Preference

Change-Id: I7e3ed686ea10557e36b24daf0b4dca27512ace2f
Remove for PA

Change-Id: Ib19f0d600acadf08e435fd58a4987d68d0f38d10