P PPR1.171228.001 merge 84b34b244b6bae8c1855bf763e676f10e5eb3d91 - clean

Change-Id: Ie735ec3c8b6b17899fa93c35c6d20142e0c002e0