PA Build Compatibility Hacks

Change-Id: Ibffaf8a49c162ac9748d233a1e719b343a47bb32