[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 0431808fae  -s ours am: 5a3c755073  -s ours
am: afb5042258  -s ours

Change-Id: Iac2d76834ff35758bbba7c6b8cc5fa7b9798f348