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

Bug: 120502534
Change-Id: Ia67bedf5ff0b2e0aedaa38439dc7215a47d6833e