Build Fixes for PA Settings

Change-Id: Id56626474c87c768d13a39fd7c1dba024f13eee1