Merge PPR1.180508.001

Change-Id: Ia7481d56264031a72cdd48eabbf3e7146d87dceb