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

Change-Id: Ic317581ed9dea530ae80f881652c8cd2613bcd28