Merge PPR1.180507.001

Change-Id: If171e693e08e645e5ccfd380182489ae93629435