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

Bug: 120502534
Change-Id: If069a02620d2ffe169f92ac348536b5f155de52b