Fix the nightlies for p51xx and P31xx

Change-Id: I071a418e9350fbd8af6cf0c277397c049d3faf87