(no-ticket) Fix pa tests.

Change-Id: I4c2989fadbb3b027990ba4c79d9c51e903bf75e0
Merge "(no-ticket) Fix pa tests."