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

Bug: 120502534
Change-Id: Ic2f8d33df01f1736a890182be8da0b7407da328e