Merge PPR1.180517.004

Change-Id: I7f54f571dc7b073b749dd185bf4b78a7a5ec6cf1