Merge PPR1.180605.002

Change-Id: Ie80adbc1c0a724fd471e972d828bc41d74dcd2e2