Merge PPR1.180605.002

Change-Id: Iba1727eb5dc7daacbd7ea03a9f4a4194ad12551a