vendor/pa testing branch

Change-Id: I084db4169dfd6966a2e285cec56650515940e962