Follow our own p3100 and p5100

Change-Id: I12944298c3066549ae16f43a831614ac3de01f6d