P PPR1.171228.001 merge 717efeb66cb01ddb17df98b2e9833d36f3f18b08 - clean

Change-Id: If0018c428a14add05311fbd0b8e0671a94e684b0