Merge PPR1.180605.002

Change-Id: I26026c1611c193ffd22fec03ec1ae44bdbcae5d4