P PPR1.171228.001 merge 581ec396e4db2c4e4e6f79c630f36e1050a7ec57 - clean

Change-Id: I7ad51bd903110a848a6b9582c352369449d0a300