P PPR1.171228.001 merge db81698cd11ec31a2313bdb9216435aff1f4df59 - clean

Change-Id: I1df1cf0522336b3550977da9271e488844a56fdc