Prepare for PA preference

Change-Id: I01070af14c52ba2c128ea9f9c4d547688eee048a