DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: Ifdd73b6dfcf3791fb8dae2b1796a34bb56aea190