[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 5e392a25a7  -s ours
am: 2841afd9b6  -s ours

Change-Id: I93604f160e58b158b7b2a88118f3ef499d76af95