Fixup -p option

Change-Id: I9c709b3da5558f26c5c06eab9e09a1c243f25e48