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

Bug: 120502534
Change-Id: I2f628c4ea8232cd3b09aa0d583ab8189952b1b3c