Merge PPR1.180514.001

Change-Id: I2c5436ecc04f30c14438c605001f7074df721cf4