P PPR1.171228.001 merge 04b547ed439f4f5266294f56ffe6642dc04f7a79 - clean

Change-Id: I23fff99b0c4747bb77edbbd769a48759caf273f6