P PPR1.171228.001 merge e669b3edd97c6c8c3f7b86252195cc7c48059a31 - clean

Change-Id: I8fb491424b3a1039f5750003da9a1bc55b5c2f9a