Some redefines from PA for few layouts...

Change-Id: Ibeb92d76c6d7a75eb28b567c187cc244a96ee823