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

Change-Id: I9c64b7b9fba10e73f71a17337231973c7bb031b1