[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 3449df5704  -s ours
am: ff9ea058c6  -s ours

Change-Id: I8757f0b303be30b7c6b15aa0b89e07f104f00c34