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

Bug: 120502534
Change-Id: Ie28536cf36e557a5dd035c975f6f26a3c4fd8958