Fixup -p option

Change-Id: I9c709b3da5558f26c5c06eab9e09a1c243f25e48
(cherry picked from commit d368ca89211230b30532d6437f73aa116f19946b)