Fix Build to adjust with PA's Prefs

Change-Id: I517d9dbe54fcc61504d6612fee41f4c3c59eac94