[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 61b64108d7  -s ours am: f032484732  -s ours
am: ba9ecd40fd  -s ours

Change-Id: I7812eba5a69ea9a01cf7d701b410524f0b7f1101