P PPR1.171228.001 merge 41aa53c880f5efa03a2b58d42a3f0a45a6a4e00d - clean

Change-Id: If6035106e1ef191bb4c3eb521e1c55e4565e7d6f