[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 66b49a2d09  -s ours am: bff7c00c72  -s ours
am: 2b5e3bdb9c  -s ours

Change-Id: I7812eba5a69ea9a01cf7d701b410524f0b7f1101