P PPR1.180311.001 merge e996887fad861a8c622367fc61318c85c6e8bfb6 - clean

Change-Id: Ic0630e31a47e4924059cde316411f2b1e7dc8e28