Merge PPR1.180531.001

Change-Id: I68e99baea4a08a7fc175479fd754a5eb052565bc