P PPR1.180114.001 merge 4e9d4f847003c4aa4df9a5e12c2d354add01f722 - clean

Change-Id: Ic9937d466fa2c0d718b1bdb2e650449a6d33a0d7