Merge "Fix test following -p removal."
am: 5e49fbc547

Change-Id: I1dafc0af6adccf750d472a85df21ddf490b62bb2