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

Bug: 120502534
Change-Id: I34d1797574f9194d6b806bf0500df37de315f4d7