[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 419086d8b3  -s ours am: 7768155274  -s ours
am: e21ca76caf  -s ours

Change-Id: I4436b32c366bb62b2a2099d6f817e02cfa8c5927