Merge PPR1.180523.002

Change-Id: If6724198ed04c9fcacad311c4fae152b4bf5e5fa