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

Change-Id: Ie7c10643475e834753b185fdce917b94dc9a6e25