P PPR1.171228.001 merge ea702acc8ed28a3c2a5e256dce796efe70c9cdd6 - clean

Change-Id: I4a125531f80e432022a1533c567e9709d48f1cd7