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

Change-Id: I3924df5cb5a3a9631a2179d46939e0ff2f9e3e52